ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install libjpeg run-time programs and man pages and include in Unix/Linux packages

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@197 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-06-04 23:54:10 +00:00
parent 8c2b9fa744
commit 8e2bba9e02
4 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@@ -39,7 +39,8 @@ endif
TSTHDRS = rrutil.h rrtimer.h
noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg jpegtran rdjpgcom wrjpgcom
bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
noinst_PROGRAMS = jpgtest jpegut
jpgtest_SOURCES = $(TSTHDRS) jpgtest.cxx bmp.h bmp.c
@@ -78,7 +79,7 @@ wrjpgcom_SOURCES = wrjpgcom.c
wrjpgcom_LDADD = libjpeg.la
DISTMANS= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
DOCS= README install.doc usage.doc wizard.doc example.c libjpeg.doc \
structure.doc coderules.doc filelist.doc jconfig.doc change.log \
@@ -88,7 +89,7 @@ DOCS= README install.doc usage.doc wizard.doc example.c libjpeg.doc \
TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \
testimgfst.jpg testimgint.jpg testimgp.jpg testimgfst.ppm testimgint.ppm
EXTRA_DIST = win release $(DOCS) $(DISTMANS) $(TESTFILES)
EXTRA_DIST = win release $(DOCS) $(TESTFILES)
dist-hook:
rm -rf `find $(distdir) -name .svn`

21
release/libjpeg-turbo.spec
View File

@@ -39,13 +39,13 @@ TurboJPEG/IPP. It is faster in some areas but slower in others.
#-->%setup -q
#-->%build
#-->configure prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib} --with-pic
#-->make prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib}
#-->configure prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib} mandir=$RPM_BUILD_ROOT/opt/%{name}/man --with-pic
#-->make prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib} mandir=$RPM_BUILD_ROOT/opt/%{name}/man
%install
rm -rf $RPM_BUILD_ROOT
make install prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib}
make install prefix=$RPM_BUILD_ROOT/opt/%{name} libdir=$RPM_BUILD_ROOT/opt/%{name}/%{__lib} mandir=$RPM_BUILD_ROOT/opt/%{name}/man
rm -f $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/*.la
mkdir -p $RPM_BUILD_ROOT/usr/%{__lib}
mv $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/libturbojpeg.* $RPM_BUILD_ROOT/usr/%{__lib}
@@ -69,8 +69,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc %{_srcdir}/README-turbo.txt %{_srcdir}/README %{_srcdir}/libjpeg.doc %{_srcdir}/LICENSE.txt %{_srcdir}/LGPL.txt
%doc %{_srcdir}/README-turbo.txt %{_srcdir}/README %{_srcdir}/libjpeg.doc %{_srcdir}/usage.doc %{_srcdir}/LICENSE.txt %{_srcdir}/LGPL.txt
%dir /opt/%{name}
%dir /opt/%{name}/bin
/opt/%{name}/bin/cjpeg
/opt/%{name}/bin/djpeg
/opt/%{name}/bin/jpegtran
/opt/%{name}/bin/rdjpgcom
/opt/%{name}/bin/wrjpgcom
%dir /opt/%{name}/%{__lib}
%ifarch x86_64
%else
@@ -90,5 +96,12 @@ rm -rf $RPM_BUILD_ROOT
/opt/%{name}/include/jmorecfg.h
/opt/%{name}/include/jpeglib.h
/opt/%{name}/include/turbojpeg.h
%dir /opt/%{name}/man
%dir /opt/%{name}/man/man1
/opt/%{name}/man/man1/cjpeg.1*
/opt/%{name}/man/man1/djpeg.1*
/opt/%{name}/man/man1/jpegtran.1*
/opt/%{name}/man/man1/rdjpgcom.1*
/opt/%{name}/man/man1/wrjpgcom.1*
%changelog

19
release/makemacpkg
View File

@@ -42,7 +42,7 @@ TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
PKGROOT=$TMPDIR/pkg/Package_Root
mkdir -p $PKGROOT
mkdir -p $PKGROOT/opt/$PACKAGE_NAME/bin
make install prefix=$PKGROOT/opt/$PACKAGE_NAME
make install prefix=$PKGROOT/opt/$PACKAGE_NAME mandir=$PKGROOT/opt/$PACKAGE_NAME/man
rm -f $PKGROOT/opt/$PACKAGE_NAME/lib/*.la
mkdir -p $PKGROOT/usr/lib
mv $PKGROOT/opt/$PACKAGE_NAME/lib/libturbojpeg.* $PKGROOT/usr/lib
@@ -81,6 +81,22 @@ if [ $UNIVERSAL = 1 ]; then
lipo -create -arch i386 $TMPDIR/dist.x86/lib/libturbojpeg.a -arch x86_64 \
$PKGROOT/usr/lib/libturbojpeg.a \
-output $PKGROOT/usr/lib/libturbojpeg.a
lipo -create -arch i386 $TMPDIR/dist.x86/bin/cjpeg -arch x86_64 \
$PKGROOT/opt/$PACKAGE_NAME/bin/cjpeg \
-output $PKGROOT/opt/$PACKAGE_NAME/bin/cjpeg
lipo -create -arch i386 $TMPDIR/dist.x86/bin/djpeg -arch x86_64 \
$PKGROOT/opt/$PACKAGE_NAME/bin/djpeg \
-output $PKGROOT/opt/$PACKAGE_NAME/bin/djpeg
lipo -create -arch i386 $TMPDIR/dist.x86/bin/jpegtran -arch x86_64 \
$PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran \
-output $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran
lipo -create -arch i386 $TMPDIR/dist.x86/bin/rdjpgcom -arch x86_64 \
$PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom \
-output $PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom
lipo -create -arch i386 $TMPDIR/dist.x86/bin/wrjpgcom -arch x86_64 \
$PKGROOT/opt/$PACKAGE_NAME/bin/wrjpgcom \
-output $PKGROOT/opt/$PACKAGE_NAME/bin/wrjpgcom
fi
install_name_tool -id /opt/$PACKAGE_NAME/lib/libjpeg.62.dylib $PKGROOT/opt/$PACKAGE_NAME/lib/libjpeg.62.dylib
@@ -111,6 +127,7 @@ install -m 644 $SRCDIR/LGPL.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/LGP
install -m 644 $SRCDIR/README-turbo.txt $PKGROOT/Library/Documentation/$PACKAGE_NAME/README-turbo.txt
install -m 644 $SRCDIR/README $PKGROOT/Library/Documentation/$PACKAGE_NAME/README
install -m 644 $SRCDIR/libjpeg.doc $PKGROOT/Library/Documentation/$PACKAGE_NAME/libjpeg.doc
install -m 644 $SRCDIR/usage.doc $PKGROOT/Library/Documentation/$PACKAGE_NAME/usage.doc
sudo chown -R root:admin $PKGROOT
sudo chown -R root:0 $PKGROOT/usr

22
release/makesunpkg
View File

@@ -53,8 +53,6 @@ else
fi
# This mess is to work around a bug in /usr/ccs/bin/make
make install prefix=$PKGROOT libdir=$PKGROOT/$__LIB AM_MAKEFLAGS="prefix=$PKGROOT libdir=$PKGROOT/$__LIB"
rm -f $PKGROOT/$__LIB/*.la
if [ $COMBINED = 1 ]; then
if [ ! -d $SRCDIR/solx86 ]; then
mkdir -p $SRCDIR/solx86
@@ -62,11 +60,13 @@ if [ $COMBINED = 1 ]; then
PWD=`pwd`
cd $SRCDIR/solx86
sh $SRCDIR/configure --with-pic CC=$CC CXX=$CXX CFLAGS= CXXFLAGS= LDFLAGS= host_alias=
make install prefix=$PKGROOT AM_MAKEFLAGS="prefix=$PKGROOT"
make install prefix=$PKGROOT AM_MAKEFLAGS="prefix=$PKGROOT mandir=$PKGROOT/man"
cd $PWD
fi
make install prefix=$PKGROOT libdir=$PKGROOT/$__LIB mandir=$PKGROOT/man AM_MAKEFLAGS="prefix=$PKGROOT libdir=$PKGROOT/$__LIB mandir=$PKGROOT/man"
rm -f $PKGROOT/$__LIB/*.la
mkdir -p $PKGROOT/doc
cp $SRCDIR/LICENSE.txt $SRCDIR/LGPL.txt $SRCDIR/README-turbo.txt $SRCDIR/README $SRCDIR/libjpeg.doc $PKGROOT/doc
cp $SRCDIR/LICENSE.txt $SRCDIR/LGPL.txt $SRCDIR/README-turbo.txt $SRCDIR/README $SRCDIR/libjpeg.doc $SRCDIR/usage.doc $PKGROOT/doc
chmod 644 $PKGROOT/doc/*
cat >$TMPDIR/proto <<EOF
@@ -74,6 +74,12 @@ i copyright
i depend
i pkginfo
d none libjpeg-turbo 0755 root bin
d none libjpeg-turbo/bin 0755 root bin
f none libjpeg-turbo/bin/cjpeg 0755 root bin
f none libjpeg-turbo/bin/djpeg 0755 root bin
f none libjpeg-turbo/bin/jpegtran 0755 root bin
f none libjpeg-turbo/bin/rdjpgcom 0755 root bin
f none libjpeg-turbo/bin/wrjpgcom 0755 root bin
d none libjpeg-turbo/lib 0755 root bin
EOF
if [ $COMBINED = 1 ]; then
@@ -98,6 +104,13 @@ f none libjpeg-turbo/${__LIB}/libjpeg.a 0644 root bin
f none libjpeg-turbo/${__LIB}/libturbojpeg.so 0755 root bin
f none libjpeg-turbo/${__LIB}/libturbojpeg.a 0644 root bin
s none libjpeg-turbo/lib32=lib
d none libjpeg-turbo/man 0755 root bin
d none libjpeg-turbo/man/man1 0755 root bin
d none libjpeg-turbo/man/man1/cjpeg.1 0644 root bin
d none libjpeg-turbo/man/man1/djpeg.1 0644 root bin
d none libjpeg-turbo/man/man1/jpegtran.1 0644 root bin
d none libjpeg-turbo/man/man1/rdjpgcom.1 0644 root bin
d none libjpeg-turbo/man/man1/wrjpgcom.1 0644 root bin
d none libjpeg-turbo/include 0755 root bin
f none libjpeg-turbo/include/jconfig.h 0644 root bin
f none libjpeg-turbo/include/jerror.h 0644 root bin
@@ -110,6 +123,7 @@ f none libjpeg-turbo/doc/libjpeg.doc 0644 root bin
f none libjpeg-turbo/doc/LICENSE.txt 0644 root bin
f none libjpeg-turbo/doc/README 0644 root bin
f none libjpeg-turbo/doc/README-turbo.txt 0644 root bin
f none libjpeg-turbo/doc/usage.doc 0644 root bin
EOF
pkgmk -o -r $TMPDIR/pkgbuild -d $TMPDIR -a i386 -f $TMPDIR/proto