head 1.8; access; symbols pkgsrc-2026Q1:1.7.0.6 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.4 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.2 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.6.0.56 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.54 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.52 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.50 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.48 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.46 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.44 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.42 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.40 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.38 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.36 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.34 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.32 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.30 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.28 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.26 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.24 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.22 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.20 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.18 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.16 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.12 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.14 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.10 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.8 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.6 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.4 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.2 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.5.0.10 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.8 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.6 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.4 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.3.0.36 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.34 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.32 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.30 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.28 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.26 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.24 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.22 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.20 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.18 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.16 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.14 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.12 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.10 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.8 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.6 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.4 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.2 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.8 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.6 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.4 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2; locks; strict; comment @# @; 1.8 date 2026.06.07.17.30.05; author adam; state Exp; branches; next 1.7; commitid Qxx5OlG2eY3AiTIG; 1.7 date 2025.08.08.08.13.08; author wiz; state Exp; branches; next 1.6; commitid 4jVXSKitep59XT5G; 1.6 date 2018.09.23.21.09.33; author wiz; state Exp; branches; next 1.5; commitid BSwN7gaZsiCpXgTA; 1.5 date 2017.09.20.06.47.56; author adam; state Exp; branches; next 1.4; commitid 6jJlPEvCzr281U7A; 1.4 date 2017.07.13.13.19.59; author wiz; state Exp; branches; next 1.3; commitid e1oDqigILyLBp4Zz; 1.3 date 2013.03.26.08.17.22; author sbd; state Exp; branches; next 1.2; 1.2 date 2011.10.08.06.09.34; author dsainty; state Exp; branches; next 1.1; 1.1 date 2011.10.05.21.41.25; author ryoon; state Exp; branches; next ; desc @@ 1.8 log @rtmpdump: switch to openssl (which is the default) to fix problem building with nettle 4.0 @ text @$NetBSD: patch-librtmp_Makefile,v 1.7 2025/08/08 08:13:08 wiz Exp $ Use PREFIX and PKGMANDIR. Remove OPT. Libtoolize --- librtmp/Makefile.orig 2025-08-08 08:05:50.000000000 +0000 +++ librtmp/Makefile @@@@ -1,11 +1,11 @@@@ VERSION=v2.4 -prefix=/usr/local +prefix=${PREFIX} incdir=$(prefix)/include/librtmp bindir=$(prefix)/bin libdir=$(prefix)/lib -mandir=$(prefix)/man +mandir=$(prefix)/${PKGMANDIR} BINDIR=$(DESTDIR)$(bindir) INCDIR=$(DESTDIR)$(incdir) LIBDIR=$(DESTDIR)$(libdir) @@@@ -73,30 +73,42 @@@@ SO_LIB=$(SOLIB_$(SHARED)) SO_INST=$(SOINST_$(SHARED)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) -OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) LDFLAGS=$(XLDFLAGS) OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o -all: librtmp.a $(SO_LIB) +all: librtmp.la clean: rm -f *.o *.a *.$(SOX) *$(SO_EXT) librtmp.pc -librtmp.a: $(OBJS) - $(AR) rs $@@ $? - -librtmp$(SO_EXT): $(OBJS) - $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@@ $^ $> $(CRYPTO_LIB) +librtmp.la: $(OBJS) + ${LIBTOOL} --mode=link --tag=CC \ + ${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \ + ${OBJS:.o=.lo} \ + -rpath ${PREFIX}/lib + +librtmp.$(SO_EXT): $(OBJS) + ${LIBTOOL} --mode=link --tag=CC \ + ${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \ + ${OBJS:.o=.lo} \ + -rpath ${PREFIX}/lib \ + -version-info 0:0 ln -sf $@@ librtmp.$(SOX) log.o: log.c log.h Makefile + ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c log.c rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile + ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c rtmp.c amf.o: amf.c amf.h bytes.h log.h Makefile + ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c amf.c hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile + ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c hashswf.c parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile + ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c parseurl.c + librtmp.pc: librtmp.pc.in Makefile sed -e "s;@@prefix@@;$(prefix);" -e "s;@@libdir@@;$(libdir);" \ @@@@ -105,12 +117,12 @@@@ librtmp.pc: librtmp.pc.in Makefile -e "s;@@PUBLIC_LIBS@@;$(PUBLIC_LIBS);" \ -e "s;@@PRIVATE_LIBS@@;$(PRIVATE_LIBS);" librtmp.pc.in > $@@ -install: install_base $(SO_INST) +install: install_base -install_base: librtmp.a librtmp.pc +install_base: librtmp.la librtmp.pc -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 cp amf.h http.h log.h rtmp.h $(INCDIR) - cp librtmp.a $(LIBDIR) + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} librtmp.la $(LIBDIR) cp librtmp.pc $(LIBDIR)/pkgconfig cp librtmp.3 $(MANDIR)/man3 @ 1.7 log @rtmpdump: update to 2.6.0.0.6f6bb1353fc84f4cc37138baa99f586750028a01. 1 March 2024, v2.6 - miscellaneous cleanup of authentication and encryption support @ text @d1 1 a1 1 $NetBSD: patch-librtmp_Makefile,v 1.6 2018/09/23 21:09:33 wiz Exp $ a5 1 Choose gnutls. a22 11 @@@@ -16,8 +16,8 @@@@ LD=$(CROSS_COMPILE)ld AR=$(CROSS_COMPILE)ar SYS=posix -CRYPTO=OPENSSL -#CRYPTO=GNUTLS +#CRYPTO=OPENSSL +CRYPTO=GNUTLS DEF_POLARSSL=-DUSE_POLARSSL DEF_OPENSSL=-DUSE_OPENSSL DEF_GNUTLS=-DUSE_GNUTLS @ 1.6 log @rtmpdump: update to 2.4.0.0.fa8646daeb19dfd12c181f7d19de708d623704c0. This is the latest git version of the program (from 2015 though). Switch the build to use gnutls for the command line program, since openssl 1.1 is not supported. Various changes since the last released version, but only git log available. Mostly bugfixes. Update bl3.mk file: neither zlib nor openssl nor gnutls headers/libraries are used by the library, so remove all bl3.mk includes. @ text @d1 1 a1 1 $NetBSD: patch-librtmp_Makefile,v 1.5 2017/09/20 06:47:56 adam Exp $ d8 1 a8 1 --- librtmp/Makefile.orig 2018-09-23 10:40:58.000000000 +0000 d94 1 a94 1 -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR) @ 1.5 log @rtmpdump: clean-up Clean-up: Removed double USE_LIBTOOL=yes. Pass external CFLAGS and LDFLAGS. Put PREFIX in patches, removing SUBST. Do not override optimisation with OPT=-O2. @ text @d1 1 a1 1 $NetBSD: patch-librtmp_Makefile,v 1.4 2017/07/13 13:19:59 wiz Exp $ d6 1 d8 1 a8 1 --- librtmp/Makefile.orig 2011-07-12 00:24:33.000000000 +0000 d24 12 a35 1 @@@@ -66,30 +66,41 @@@@ SO_LIB=$(SOLIB_$(SHARED)) d50 1 a50 1 rm -f *.o *.a *.$(SOX) *.$(SO_EXT) d54 3 d62 2 a63 3 librtmp.$(SO_EXT): $(OBJS) - $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@@ $^ $> $(CRYPTO_LIB) d81 1 d85 2 a86 2 @@@@ -97,12 +108,12 @@@@ librtmp.pc: librtmp.pc.in Makefile -e "s;@@CRYPTO_REQ@@;$(CRYPTO_REQ);" \ d94 1 a94 1 -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 @ 1.4 log @Honor LDFLAGS. Fixes RELRO build. @ text @d1 1 a1 1 $NetBSD: patch-librtmp_Makefile,v 1.3 2013/03/26 08:17:22 sbd Exp $ d3 2 d12 2 a13 1 prefix=/usr/local d23 3 a25 1 @@@@ -68,28 +68,40 @@@@ SO_INST=$(SOINST_$(SHARED)) d27 1 a27 1 OPT=-O2 d29 1 a29 2 -LDFLAGS=$(XLDFLAGS) +LDFLAGS+=$(XLDFLAGS) d70 1 a70 1 @@@@ -97,12 +109,12 @@@@ librtmp.pc: librtmp.pc.in Makefile @ 1.3 log @Respect ${PKGMANDIR} @ text @d1 1 a1 1 $NetBSD: patch-librtmp_Makefile,v 1.2 2011/10/08 06:09:34 dsainty Exp $ d7 5 a11 1 @@@@ -5,7 +5,7 @@@@ prefix=/usr/local d20 7 a26 1 @@@@ -73,23 +73,35 @@@@ LDFLAGS=$(XLDFLAGS) d40 1 a40 1 + ${CC} -o ${.TARGET:.a=.la} \ d47 1 a47 1 + ${CC} -o ${.TARGET:.a=.la} \ @ 1.2 log @Update to rtmpdump version 2.4: 11 July 2011, v2.4 - add RTMPE type 9 handshake support @ text @d1 1 a1 1 $NetBSD: patch-librtmp_Makefile,v 1.1 2011/10/05 21:41:25 ryoon Exp $ d5 12 a16 3 --- librtmp/Makefile 2011-07-12 12:24:33.000000000 +1200 +++ librtmp/Makefile 2011-10-08 17:59:54.713362187 +1300 @@@@ -73,23 +73,35 @@@@ d56 1 a56 1 @@@@ -97,12 +109,12 @@@@ @ 1.1 log @Fix PR pkg/44125. Libtoolized. @ text @d1 1 a1 1 $NetBSD$ d5 3 a7 3 --- librtmp/Makefile.orig 2010-06-30 20:01:28.000000000 +0000 +++ librtmp/Makefile @@@@ -52,34 +52,46 @@@@ MANDIR=$(DESTDIR)$(mandir) d15 1 a15 1 rm -f *.o *.a *.so *.$(SO_EXT) d26 1 a26 1 - $(CC) -shared -Wl,-soname,$@@ $(LDFLAGS) -o $@@ $^ $> $(CRYPTO_LIB) d32 1 a32 1 ln -sf $@@ librtmp.so d34 1 a34 6 -log.o: log.c log.h Makefile -rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile -amf.o: amf.c amf.h bytes.h log.h Makefile -hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile -parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile +log.o: d36 1 a36 1 +rtmp.o: d38 1 a38 1 +amf.o: d40 1 a40 1 +hashswf.o: d42 1 a42 1 +parseurl.o: d46 4 a49 2 sed -e "s;@@prefix@@;$(prefix);" -e "s;@@VERSION@@;$(VERSION);" \ -e "s;@@CRYPTO_REQ@@;$(CRYPTO_REQ);" librtmp.pc.in > $@@ @