[pkgsrc/trunk]: pkgsrc/multimedia/transcode Don't link libvout and libac3_tc ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/multimedia/transcode Don't link libvout and libac3_tc ...
From: sekiya <sekiya%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:42:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/435133f3d656
branches:  trunk
changeset: 482049:435133f3d656
user:      sekiya <sekiya%pkgsrc.org@localhost>
date:      Tue Oct 19 02:15:05 2004 +0000

description:
Don't link libvout and libac3_tc to import/export modules -- these two libraries
are static, so libtool will refuse to create a working module.

Instead, link those libraries into the transcode binary itself (libvout was
already being so linked) and remove them from the module link arguments.

diffstat:

 multimedia/transcode/Makefile         |    4 +-
 multimedia/transcode/distinfo         |   11 +-
 multimedia/transcode/patches/patch-aq |   16 ---
 multimedia/transcode/patches/patch-ar |   16 ---
 multimedia/transcode/patches/patch-aw |   30 +++++++
 multimedia/transcode/patches/patch-ax |  139 ++++++++++++++++++++++++++++++++++
 multimedia/transcode/patches/patch-ay |   30 +++++++
 multimedia/transcode/patches/patch-ba |   47 +++++++++++
 multimedia/transcode/patches/patch-bb |   47 +++++++++++
 multimedia/transcode/patches/patch-bc |   11 ++
 multimedia/transcode/patches/patch-bd |   11 ++
 11 files changed, 325 insertions(+), 37 deletions(-)

diffs (truncated from 422 to 300 lines):

diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/Makefile
--- a/multimedia/transcode/Makefile     Tue Oct 19 01:58:40 2004 +0000
+++ b/multimedia/transcode/Makefile     Tue Oct 19 02:15:05 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/19 02:15:05 sekiya Exp $
 
 DISTNAME=      transcode-0.6.12
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.zebra.fh-weingarten.de/~transcode/pre/
 
diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/distinfo
--- a/multimedia/transcode/distinfo     Tue Oct 19 01:58:40 2004 +0000
+++ b/multimedia/transcode/distinfo     Tue Oct 19 02:15:05 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/06/06 02:27:55 sekiya Exp $
+$NetBSD: distinfo,v 1.4 2004/10/19 02:15:05 sekiya Exp $
 
 SHA1 (transcode-0.6.12.tar.gz) = 3d9b223f804253a6a76d9645feb86609b0a2499a
 Size (transcode-0.6.12.tar.gz) = 3454807 bytes
@@ -14,9 +14,14 @@
 SHA1 (patch-an) = ee416096f1fc6b8ff74f80f93cc5e40d4ad49223
 SHA1 (patch-ao) = e6f1006e5aa4663259e1e2fd2355dbfc32bda8f5
 SHA1 (patch-ap) = fb393e3400423a5d4225fb31afabfbcaa265a35b
-SHA1 (patch-aq) = 3a8bd7888460880767204239ac783bff3d6814a9
-SHA1 (patch-ar) = df0bf12044741c586b0168ead6aa0fa71a23aea1
 SHA1 (patch-as) = d673ec6009d96f55afcf8382f834edc2cadd2ae3
 SHA1 (patch-at) = f598541e1ea9c7e6fcd93d7f2704397b5bdb5cd8
 SHA1 (patch-au) = 0e9731f693f209d1c2bd4b28e71c03cab94020ea
 SHA1 (patch-av) = 54ddd6059718a25ec9fdd6635c320f9e22d3ba1e
+SHA1 (patch-aw) = fc14159ab6d7071ee12202f742c0102dd08fa21c
+SHA1 (patch-ax) = 5f58867d37c844dd9c3f96619db1ff45c7c9edd6
+SHA1 (patch-ay) = cdabcfc63fad7e9728e4c78cb3ae09052b56d312
+SHA1 (patch-ba) = bd94b5d95765b9d6a7fbc424c09dffaf0760ce42
+SHA1 (patch-bb) = aa6b1f9b8bbc10270eb70ac726dd2098c87279d6
+SHA1 (patch-bc) = 22e59b0a854e1a174514928cdd65eeb308d491dd
+SHA1 (patch-bd) = 6623696fa2fe0a0346ad9a87c6a440c49b9c9ecf
diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/patches/patch-aq
--- a/multimedia/transcode/patches/patch-aq     Tue Oct 19 01:58:40 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- libac3/Makefile.am 2004-03-26 19:16:37.000000000 +0000
-+++ libac3/Makefile.am 2004-03-26 19:16:44.000000000 +0000
-@@ -4,9 +4,9 @@
- 
- CFLAGS = -O3 -funroll-loops -ffast-math -DLINUX -fPIC -DPIC @CFLAGS@
- 
--noinst_LIBRARIES = libac3_tc.a
-+noinst_LTLIBRARIES = libac3_tc.la
- 
--libac3_tc_a_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
-+libac3_tc_la_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
-       bit_allocate.c  parse.c crc.c debug.c rematrix.c downmix.c dither.c \
-       sanity_check.c
- 
diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/patches/patch-ar
--- a/multimedia/transcode/patches/patch-ar     Tue Oct 19 01:58:40 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- libvo/Makefile.am  2004-03-26 19:17:33.000000000 +0000
-+++ libvo/Makefile.am  2004-03-26 19:17:40.000000000 +0000
-@@ -3,9 +3,9 @@
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
- 
- CFLAGS = -Wall -fPIC -DPIC @CFLAGS@ -I../libmpeg2 -I$(srcdir)/../libmpeg2
--noinst_LIBRARIES = libvout.a
-+noinst_LTLIBRARIES = libvout.la
- 
--libvout_a_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
-+libvout_la_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
- 
- noinst_HEADERS = yuv2rgb.h video_out_internal.h video_out.h rgb2yuv.h mmx.h mm_accel.h 
- EXTRA_DIST = COPYING AUTHORS README
diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/patches/patch-aw
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/transcode/patches/patch-aw     Tue Oct 19 02:15:05 2004 +0000
@@ -0,0 +1,30 @@
+--- import/Makefile.am.orig    2003-12-20 20:49:13.000000000 +0900
++++ import/Makefile.am 2004-08-29 09:15:09.000000000 +0900
+@@ -124,11 +124,11 @@
+ 
+ import_ac3_la_SOURCES = import_ac3.c ioaux.c ac3scan.c
+ import_ac3_la_LDFLAGS =  -module -avoid-version 
+-import_ac3_la_LIBADD  = $(AC3_LIB) -lm
++import_ac3_la_LIBADD  = -lm
+ 
+ import_vdrac3_la_SOURCES = import_vdrac3.c ioaux.c ac3scan.c
+ import_vdrac3_la_LDFLAGS =  -module -avoid-version 
+-import_vdrac3_la_LIBADD  = $(AC3_LIB) -lm
++import_vdrac3_la_LIBADD  = -lm
+ 
+ a52_decore_la_SOURCES = a52_decore.c ioaux.c
+ a52_decore_la_LDFLAGS =  -module -avoid-version 
+@@ -148,11 +148,11 @@
+ 
+ import_vob_la_SOURCES = import_vob.c ac3scan.c clone.c ioaux.c frame_info.c ivtc.c
+ import_vob_la_LDFLAGS =        -module -avoid-version 
+-import_vob_la_LIBADD = $(AC3_LIB) -lm
++import_vob_la_LIBADD = -lm
+ 
+ import_dvd_la_SOURCES = import_dvd.c ac3scan.c dvd_reader.c clone.c ioaux.c frame_info.c ivtc.c
+ import_dvd_la_LDFLAGS =  -module -avoid-version 
+-import_dvd_la_LIBADD =  @DVDREAD_LIBS@ $(AC3_LIB) -lm
++import_dvd_la_LIBADD =  @DVDREAD_LIBS@ -lm
+ 
+ import_dv_la_SOURCES = import_dv.c 
+ import_dv_la_LDFLAGS =  -module -avoid-version 
diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/patches/patch-ax
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/transcode/patches/patch-ax     Tue Oct 19 02:15:05 2004 +0000
@@ -0,0 +1,139 @@
+--- export/Makefile.am.orig    2003-12-20 20:49:11.000000000 +0900
++++ export/Makefile.am 2004-08-29 09:25:46.000000000 +0900
+@@ -3,7 +3,6 @@
+ AUTOMAKE_OPTIONS = 1.3 foreign
+ DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
+ 
+-AC3_LIB=-L../libac3 -lac3_tc
+ AC3_INC=-I../libac3 -I$(srcdir)/../libac3
+ 
+ INCLUDES = -I./ -I../ -I$(srcdir)/.. -I../src -I$(srcdir)/../src -I../avilib -I$(srcdir)/../avilib @AVIFILE_CFLAGS@ @LAME_CFLAGS@ $(AC3_INC) @QT_CFLAGS@ -Wall @DV_CFLAGS@ -I../libvo 
-I$(srcdir)/../libvo @MJPEG_CFLAGS@ @LIBFAME_CFLAGS@ @MAGICK_CFLAGS@ @LIBJPEG_CFLAGS@ -I../libioaux -I$(srcdir)/../libioaux @LZO_CFLAGS@ @PVM3_CFLAGS@ -I../pvm3
+@@ -106,7 +105,7 @@
+ 
+ export_mp1e_la_SOURCES = export_mp1e.c vid_aux.c
+ export_mp1e_la_LDFLAGS =  -module -avoid-version 
+-export_mp1e_la_LIBADD  = -L../libvo -lvout -lm
++export_mp1e_la_LIBADD  = -lm
+ 
+ export_ogg_la_SOURCES = export_ogg.c
+ export_ogg_la_LDFLAGS =  -module -avoid-version 
+@@ -129,7 +128,7 @@
+ 
+ export_fame_la_SOURCES = export_fame.c aud_aux.c
+ export_fame_la_LDFLAGS =  -module -avoid-version 
+-export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ $(AC3_LIB) -lm
++export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ -lm
+ 
+ export_lame_la_SOURCES = export_lame.c
+ export_lame_la_LDFLAGS =  -module -avoid-version 
+@@ -137,55 +136,55 @@
+ 
+ export_af6_la_SOURCES = export_af6.cpp af6_aux.cpp aud_aux.c
+ export_af6_la_LDFLAGS =  -module -avoid-version 
+-export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ $(AC3_LIB) -lm 
++export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ -lm 
+ 
+ export_divx4_la_SOURCES = export_divx4.c aud_aux.c divx4_vbr.c
+ export_divx4_la_LDFLAGS =  -module -avoid-version 
+-export_divx4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
++export_divx4_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_divx5_la_SOURCES = export_divx5.c aud_aux.c divx4_vbr.c
+ export_divx5_la_LDFLAGS =  -module -avoid-version 
+-export_divx5_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
++export_divx5_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_divx5raw_la_SOURCES = export_divx5raw.c aud_aux.c divx4_vbr.c
+ export_divx5raw_la_LDFLAGS =  -module -avoid-version 
+-export_divx5raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
++export_divx5raw_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_ffmpeg_la_SOURCES = export_ffmpeg.c aud_aux.c ffmpeg_cfg.c vid_aux.c
+ export_ffmpeg_la_LDFLAGS =  -module -avoid-version 
+-export_ffmpeg_la_LIBADD = @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
++export_ffmpeg_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_divx4raw_la_SOURCES = export_divx4raw.c aud_aux.c divx4_vbr.c
+ export_divx4raw_la_LDFLAGS =  -module -avoid-version 
+-export_divx4raw_la_LIBADD =  @LAME_LIBS@ $(AC3_LIB) -lm
++export_divx4raw_la_LIBADD =  @LAME_LIBS@ -lm
+ 
+ export_xvid2_la_SOURCES = export_xvid2.c aud_aux.c xvid_vbr.c
+ export_xvid2_la_LDFLAGS =  -module -avoid-version 
+-export_xvid2_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
++export_xvid2_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_xvid3_la_SOURCES = export_xvid3.c aud_aux.c xvid_vbr.c
+ export_xvid3_la_LDFLAGS =  -module -avoid-version 
+-export_xvid3_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
++export_xvid3_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_xvid4_la_SOURCES = export_xvid4.c aud_aux.c
+ export_xvid4_la_LDFLAGS =  -module -avoid-version 
+-export_xvid4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
++export_xvid4_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_raw_la_SOURCES = export_raw.c aud_aux.c
+ export_raw_la_LDFLAGS =  -module -avoid-version 
+-export_raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
++export_raw_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_lzo_la_SOURCES = export_lzo.c aud_aux.c
+ export_lzo_la_LDFLAGS =  -module -avoid-version 
+-export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ $(AC3_LIB) -lm
++export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ -lm
+ 
+ export_debugppm_la_SOURCES = export_debugppm.c aud_aux.c
+ export_debugppm_la_LDFLAGS =  -module -avoid-version 
+-export_debugppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
++export_debugppm_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_ppm_la_SOURCES = export_ppm.c aud_aux.c
+ export_ppm_la_LDFLAGS =  -module -avoid-version 
+-export_ppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
++export_ppm_la_LIBADD = @LAME_LIBS@ -lm
+ 
+ export_mov_la_SOURCES = export_mov.c 
+ export_mov_la_LDFLAGS =  -module -avoid-version 
+@@ -193,34 +192,34 @@
+ 
+ export_dvraw_la_SOURCES = export_dvraw.c vid_aux.c
+ export_dvraw_la_LDFLAGS =  -module -avoid-version 
+-export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -L../libvo -lvout -lm
++export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -lm
+ 
+ export_dv_la_SOURCES = export_dv.c aud_aux.c vid_aux.c
+ export_dv_la_LDFLAGS =  -module -avoid-version 
+-export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ $(AC3_LIB)  -L../libvo -lvout -lm 
++export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ -lm 
+ 
+ export_yuv4mpeg_la_SOURCES = export_yuv4mpeg.c aud_aux.c vid_aux.c
+ export_yuv4mpeg_la_LDFLAGS =  -module -avoid-version 
+-export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
++export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -lm
+ 
+ export_mpeg_la_SOURCES = export_mpeg.c vid_aux.c
+ export_mpeg_la_LDFLAGS =  -module -avoid-version 
+-export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -L../libvo -lvout -lm
++export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -lm
+ 
+ export_pvm_la_SOURCES = export_pvm.c ../pvm3/pvm_interface.c ../pvm3/pvm_parser.c ../pvm3/external_codec.c ../pvm3/vob_pack_unpack.c
+ export_pvm_la_LDFLAGS =  -module -avoid-version
+ 
+ export_mjpeg_la_SOURCES = export_mjpeg.c vid_aux.c aud_aux.c 
+ export_mjpeg_la_LDFLAGS =  -module -avoid-version 
+-export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
++export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -lm
+ 
+ export_mpeg2enc_la_SOURCES = export_mpeg2enc.c vid_aux.c
+ export_mpeg2enc_la_LDFLAGS =  -module -avoid-version 
+-export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -L../libvo -lvout -lm
++export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -lm
+ 
+ export_im_la_SOURCES = export_im.c vid_aux.c
+ export_im_la_LDFLAGS =  -module -avoid-version 
+-export_im_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout -lm 
++export_im_la_LIBADD = @MAGICK_LIBS@ -lm 
+ 
+ pkg_DATA = export_af6.conf xvid2.cfg xvid3.cfg xvid4.cfg
+ 
diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/patches/patch-ay
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/transcode/patches/patch-ay     Tue Oct 19 02:15:05 2004 +0000
@@ -0,0 +1,30 @@
+--- import/Makefile.in.orig    2004-01-07 05:39:15.000000000 +0900
++++ import/Makefile.in 2004-08-29 09:15:42.000000000 +0900
+@@ -413,11 +413,11 @@
+ 
+ import_ac3_la_SOURCES = import_ac3.c ioaux.c ac3scan.c
+ import_ac3_la_LDFLAGS = -module -avoid-version 
+-import_ac3_la_LIBADD = $(AC3_LIB) -lm
++import_ac3_la_LIBADD = -lm
+ 
+ import_vdrac3_la_SOURCES = import_vdrac3.c ioaux.c ac3scan.c
+ import_vdrac3_la_LDFLAGS = -module -avoid-version 
+-import_vdrac3_la_LIBADD = $(AC3_LIB) -lm
++import_vdrac3_la_LIBADD = -lm
+ 
+ a52_decore_la_SOURCES = a52_decore.c ioaux.c
+ a52_decore_la_LDFLAGS = -module -avoid-version 
+@@ -437,11 +437,11 @@
+ 
+ import_vob_la_SOURCES = import_vob.c ac3scan.c clone.c ioaux.c frame_info.c ivtc.c
+ import_vob_la_LDFLAGS = -module -avoid-version 
+-import_vob_la_LIBADD = $(AC3_LIB) -lm
++import_vob_la_LIBADD = -lm
+ 
+ import_dvd_la_SOURCES = import_dvd.c ac3scan.c dvd_reader.c clone.c ioaux.c frame_info.c ivtc.c
+ import_dvd_la_LDFLAGS = -module -avoid-version 
+-import_dvd_la_LIBADD = @DVDREAD_LIBS@ $(AC3_LIB) -lm
++import_dvd_la_LIBADD = @DVDREAD_LIBS@ -lm
+ 
+ import_dv_la_SOURCES = import_dv.c 
+ import_dv_la_LDFLAGS = -module -avoid-version 
diff -r 2180c7d9adc6 -r 435133f3d656 multimedia/transcode/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/transcode/patches/patch-ba     Tue Oct 19 02:15:05 2004 +0000
@@ -0,0 +1,47 @@
+--- filter/Makefile.am.orig    2004-08-29 09:04:39.000000000 +0900
++++ filter/Makefile.am 2004-08-29 09:05:27.000000000 +0900
+@@ -168,11 +168,11 @@
+ 
+ filter_smartbob_la_SOURCES = filter_smartbob.c
+ filter_smartbob_la_LDFLAGS =  -module -avoid-version
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/kphone whitespace police
Next by Date: [pkgsrc/trunk]: pkgsrc/audio/rip Initial import of rip-1.07, a command-line b...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/kphone whitespace police
Next by Thread: [pkgsrc/trunk]: pkgsrc/audio/rip Initial import of rip-1.07, a command-line b...
Indexes:
Home | Main Index | Thread Index | Old Index