From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 12 Jun 2024 16:10:10 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sHOfy-004qmT-1I for lore@lore.pengutronix.de; Wed, 12 Jun 2024 16:10:10 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sHOfx-0007mQ-1x; Wed, 12 Jun 2024 16:10:09 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sHOfu-0007m4-Ud; Wed, 12 Jun 2024 16:10:06 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sHOfu-001o6z-ET; Wed, 12 Jun 2024 16:10:06 +0200 Received: from mfe by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sHOfu-006ZYi-1B; Wed, 12 Jun 2024 16:10:06 +0200 Date: Wed, 12 Jun 2024 16:10:06 +0200 From: Marco Felsch To: LI Qingwu Message-ID: <20240612141006.gvqpgph3qseprdpy@pengutronix.de> References: <20240612133818.3256224-1-Qing-wu.Li@leica-geosystems.com.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240612133818.3256224-1-Qing-wu.Li@leica-geosystems.com.cn> Subject: Re: [OSS-Tools] [PATCH platsch V2 1/3] convert to meson build X-BeenThere: oss-tools@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: Pengutronix Public Open-Source-Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: oss-tools@pengutronix.de Sender: "OSS-Tools" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: oss-tools-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Hi, On 24-06-12, LI Qingwu wrote: > convert to meson build, add set dir and base const to fix build > warnings. Please split the patch into two: 1st) platsch: fix build warnings 2nd) build: convert to meson > Signed-off-by: LI Qingwu > --- > Makefile.am | 23 ----------------------- > README.rst | 10 ++++++++++ > configure.ac | 13 ------------- > meson.build | 15 +++++++++++++++ > platsch.c | 2 +- > 5 files changed, 26 insertions(+), 37 deletions(-) > delete mode 100644 Makefile.am > delete mode 100644 configure.ac > create mode 100644 meson.build > > diff --git a/Makefile.am b/Makefile.am > deleted file mode 100644 > index d149ae0..0000000 > --- a/Makefile.am > +++ /dev/null > @@ -1,23 +0,0 @@ > -EXTRA_DIST = README.rst LICENSE > - > -sbin_PROGRAMS = platsch > - > -platsch_SOURCES = platsch.c > -platsch_CFLAGS = $(LIBDRM_CFLAGS) > -platsch_LDADD = $(LIBDRM_LIBS) > - > -CLEANFILES = \ > - $(DIST_ARCHIVES) > - > -DISTCLEAN = \ > - config.log \ > - config.status \ > - Makefile > - > -MAINTAINERCLEANFILES = \ > - aclocal.m4 \ > - configure \ > - depcomp \ > - install-sh \ > - Makefile.in \ > - missing > diff --git a/README.rst b/README.rst > index e318120..d20eb52 100644 > --- a/README.rst > +++ b/README.rst > @@ -141,3 +141,13 @@ By adding a Signed-off-by line (e.g. using ``git commit -s``) saying:: > > (using your real name and e-mail address), you state that your contributions > are in line with the DCO. > + > +Cross compiling instructions > +---------------------------- Just: Compile instructions -------------------- > + > +To cross compile the project, use the following commands: and drop this comment please. > +.. code-block:: shell > + > + meson setup build > + meson compile -C build > diff --git a/configure.ac b/configure.ac > deleted file mode 100644 > index 18878db..0000000 > --- a/configure.ac > +++ /dev/null > @@ -1,13 +0,0 @@ > -AC_PREREQ([2.69]) > -AC_INIT([platsch], [2019.12.0], [oss-tools@pengutronix.de]) > -AC_CONFIG_SRCDIR([platsch.c]) > -AM_INIT_AUTOMAKE([foreign dist-xz]) > - > -AC_PROG_CC > -AC_PROG_MAKE_SET > - > -PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.4.112]) ^ We required an min. version of libdrm. > - > -AC_CONFIG_FILES([Makefile]) > - > -AC_OUTPUT > diff --git a/meson.build b/meson.build > new file mode 100644 > index 0000000..6815bf3 > --- /dev/null > +++ b/meson.build > @@ -0,0 +1,15 @@ > +project('platsch', 'c') > + > +platsch_dep = [dependency('libdrm', required: true)] this should be done with meson as well: platsch_dep = dependency('libdrm', version : '>= 2.4.112', required : true) > +sources = ['platsch.c'] > + > +# Define the headers > +headers = ['platsch.h'] > + > +# Create the platsch executable > +executable('platsch', > + sources, > + dependencies: platsch_dep, > + install: true, > + include_directories: include_directories('.') > +) > diff --git a/platsch.c b/platsch.c > index 535b589..1aaa8d5 100644 > --- a/platsch.c > +++ b/platsch.c > @@ -111,7 +111,7 @@ struct modeset_dev { > uint32_t crtc_id; > }; > > -void draw_buffer(struct modeset_dev *dev, char *dir, char *base) > +void draw_buffer(struct modeset_dev *dev, const char *dir, const char *base) As said previously: please move this into a separate patch. Regards, Marco > { > int fd_src; > char filename[128]; > -- > 2.34.1 > >